Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorScott Bradford <scott@scottbradford.us>
Sun, 10 Apr 2016 00:41:20 +0000 (20:41 -0400)
committerScott Bradford <scott@scottbradford.us>
Sun, 10 Apr 2016 00:41:20 +0000 (20:41 -0400)

Trivial merge